build: Get typelib dir dynamically using gobject-introspection dependency

We hardcoded the typelib directory for only an arch (and a distro),
while we can just get it from gobject-introspection pkg config if tests
are enabled.

diff --git a/meson.build b/meson.build
index 2071ec73f3f69182f1ccce4a1a2ba76fa920cf81..e6382b7db05c87fdae6df0a44d6e102ff1ad7bda 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -406,6 +406,9 @@ iso_codes_dep  = dependency('iso-codes', required: false)
 gidocgen_dep    = dependency('gi-docgen', version: '>= 2021.1',
                              fallback: ['gi-docgen', 'dummy_dep'],
                              required: get_option('gtk_doc'))
+gi_dep         = dependency('gobject-introspection-1.0', version: introspection_req,
+                            required: get_option('introspection').enabled() and
+                                      get_option('build-tests'))
 
 fontconfig_dep = [] # only used in x11 backend
 

diff --git a/testsuite/introspection/meson.build b/testsuite/introspection/meson.build
index 58eea5aca260b7671c4f07ea9145531f9a9f9eeb..6202fb74467c6307c33654cecb8e3464494d4a67 100644 (file)
--- a/testsuite/introspection/meson.build
+++ b/testsuite/introspection/meson.build
@@ -3,6 +3,7 @@ test('api',
      find_program('api.py', dirs: meson.current_source_dir()),
      suite: ['introspection'],
      env: [
-       'GI_TYPELIB_PATH=@0@/gtk:/usr/lib64/girepository-1.0'.format(project_build_root),
+       'GI_TYPELIB_PATH=@0@/gtk:@1@'.format(project_build_root,
+          gi_dep.get_pkgconfig_variable('typelibdir')),
        'LD_PRELOAD=@0@/gtk/libgtk-4.so'.format(project_build_root),
      ])